Merge branch 'master' of git://www.denx.de/git/u-boot-imx
authorTom Rini <[email protected]>
Wed, 2 Sep 2015 14:39:28 +0000 (10:39 -0400)
committerTom Rini <[email protected]>
Wed, 2 Sep 2015 14:39:28 +0000 (10:39 -0400)

Trivial merge